Merged.

diff --cc tools/python/xen/lowlevel/xs/xs.c
index f6ae190e8cb32ba3a6ec89ab9a64e2d199b45d80,e29d46b5444197545ef36291bf152f989f995818..01679b3de980e08e26fa1655f9e7efeb74106df5
--- 1/tools/python/xen/lowlevel/xs/xs.c
--- 2/tools/python/xen/lowlevel/xs/xs.c
+++ b/tools/python/xen/lowlevel/xs/xs.c
@@@ -158,9 -172,9 +158,9 @@@ static PyObject *xspy_ls(XsHandle *self
      char *path;
  
      char **xsval;
-     int xsval_n;
+     unsigned int xsval_n;
  
 -    if (!parse_transaction_path(self, args, kwds, &xh, &th, &path))
 +    if (!parse_transaction_path(self, args, &xh, &th, &path))
          return NULL;
  
      Py_BEGIN_ALLOW_THREADS